Run tests under Xvfb with GLX available (see #874077)

diff --git a/debian/changelog b/debian/changelog
index 9321875e0a9bd5453e69179344336551fa6414dd..ce2430d89446a64b4e3b537b3d626c7c19028f59 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,7 +60,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
   * Fix generation of README.md.gz symlinks
   * Generate a dependency on libgtk-4-0.9400.0 since the ABI is not yet
     stable
-  * Run build-time tests under Xvfb
+  * Run tests under Xvfb with GLX available (see #874077)
 
  -- Jeremy Bicha <jbicha@debian.org>  Fri, 19 Jan 2018 22:05:35 -0500
 

diff --git a/debian/rules b/debian/rules
index e55c45ac86239199356dacef10b571fc35287b15..4b9c21a3ade73caa44af516e0d56e01e068f1590 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -177,7 +177,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        glib-compile-schemas debian/build/glib-2.0/schemas/
        # Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail
        env -u LD_PRELOAD \
-       xvfb-run -a \
+       xvfb-run -a -s "-screen 0 640x480x16" \
        dh_auto_test --builddirectory=debian/build/deb -- -k 0 -j 1 || true
 endif
 

diff --git a/debian/tests/build b/debian/tests/build
index 5f8caeead79db64fb213f5fa3058ac8900c55132..f79d2df2dc93d8cf6a5a4db844ab77a6d4b7fb28 100755 (executable)
--- a/debian/tests/build
+++ b/debian/tests/build
@@ -54,6 +54,6 @@ EOF
 gcc -o gtktest gtktest.c `pkg-config --cflags --libs gtk+-4.0`
 echo "build: OK"
 [ -x gtktest ]
-#xvfb-run ./gtktest
+xvfb-run -a -s "-screen 0 640x480x16" \
 ./gtktest
 echo "run: OK"

diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests
index 43f32ef3a4b065df1e2563c610db4d63f0bd5cd0..ae7bf6c250ea1c23cc0a54bd8ef97e3df3b7faff 100755 (executable)
--- a/debian/tests/installed-tests
+++ b/debian/tests/installed-tests
@@ -12,7 +12,7 @@ export GIO_USE_VOLUME_MONITOR=unix
 export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP"
 
 exec dbus-run-session -- \
-xvfb-run -a \
+xvfb-run -a -s "-screen 0 640x480x16" \
 gnome-desktop-testing-runner \
 --report-directory="$AUTOPKGTEST_ARTIFACTS" \
 --tap \

diff --git a/debian/tests/python3-gi b/debian/tests/python3-gi
index a503b2508797a23bc2677917876b1ebac917af0b..26cf10bd2de1267c3e668c951a96e4782c11cf7a 100644 (file)
--- a/debian/tests/python3-gi
+++ b/debian/tests/python3-gi
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-xvfb-run python3 <<EOF
+xvfb-run -a -s "-screen 0 640x480x16" \
+python3 <<EOF
 from gi.repository import GLib, Gtk
 
 def do_quit(user_data):